Skip to content

Storage options text fixups #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 17, 2022

Conversation

jarolrod
Copy link
Member

@jarolrod jarolrod commented Dec 14, 2022

Based on #205 so as to not conflict. Only PR commit is ac13dc1

Performs small text fixups to the storage options to fall in line with the designs. Only differs from the figma designs by changing For regular wallet use. to For simple wallet use. in the StorageAmount OptionsButton control.

Master

a b
Screen Shot 2022-12-14 at 2 12 47 AM Screen Shot 2022-12-14 at 2 12 52 AM

PR

a b
Screen Shot 2022-12-14 at 2 08 00 AM Screen Shot 2022-12-14 at 2 08 18 AM

Windows
Intel macOS
Apple Silicon macOS
ARM64 Android

@jarolrod jarolrod changed the title Storage location text Storage options text fixups Dec 14, 2022
@jarolrod jarolrod force-pushed the storage-location-text branch from ac13dc1 to 9aa1163 Compare December 14, 2022 08:07
@jarolrod
Copy link
Member Author

Updated from ac13dc1 to 9aa1163

changes: rebased over changes on master

This does away with a loadable detail and places a check mark icon in
it's place.
@jarolrod jarolrod force-pushed the storage-location-text branch from 9aa1163 to a9812ff Compare December 14, 2022 16:32
@jarolrod
Copy link
Member Author

updated from 9aa1163 to a9812ff

changes: rebased over changes on master

Copy link
Collaborator

@johnny9 johnny9 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK a9812ff

Good changes

Screenshot_2022-12-17_09-46-44

@hebasto hebasto merged commit 01f3d56 into bitcoin-core:main Dec 17, 2022
hebasto pushed a commit to hebasto/gui-qml that referenced this pull request Jun 8, 2025
hebasto pushed a commit to hebasto/gui-qml that referenced this pull request Jun 9, 2025
hebasto pushed a commit to hebasto/gui-qml that referenced this pull request Jun 9, 2025
johnny9 pushed a commit to johnny9/bitcoin-core-app that referenced this pull request Jul 4, 2025
20b23bc qml: storage options description fixups (Jarol Rodriguez)

Pull request description:

  Based on bitcoin-core/gui-qml#205 so as to not conflict. Only PR commit is ac13dc1da3088099ca9c020f980d3245ac2a3084

  Performs small text fixups to the storage options to fall in line with the designs. Only differs from the [figma designs](https://www.figma.com/file/GaCoOSNHB2yMB9ThiDtred/Bitcoin-Core-App?node-id=3288%3A72160&t=ttpjexCKgAerUbB2-0) by changing `For regular wallet use.` to `For simple wallet use.` in the StorageAmount OptionsButton control.

  ### Master

  | a | b |
  | - | - |
  | <img width="752" alt="Screen Shot 2022-12-14 at 2 12 47 AM" src="https://user-images.githubusercontent.com/23396902/207529947-346fcd7b-4a7c-42bd-aee6-4784b1fbb43a.png"> | <img width="752" alt="Screen Shot 2022-12-14 at 2 12 52 AM" src="https://user-images.githubusercontent.com/23396902/207529982-e4e3faa1-7e24-4460-b5da-1d87ee69dc17.png"> |

  ### PR

  | a | b |
  | - | - |
  | <img width="752" alt="Screen Shot 2022-12-14 at 2 08 00 AM" src="https://user-images.githubusercontent.com/23396902/207530072-3da9a872-7a76-4ba7-86b0-ba7b3fc48287.png"> | <img width="752" alt="Screen Shot 2022-12-14 at 2 08 18 AM" src="https://user-images.githubusercontent.com/23396902/207530101-5503aa6b-ac23-4d95-976d-7f37f4fb50f0.png"> |

  [![Windows](https://img.shields.io/badge/OS-Windows-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/win64/insecure_win_gui.zip?branch=pull/206)
  [![Intel macOS](https://img.shields.io/badge/OS-Intel%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos/insecure_mac_gui.zip?branch=pull/206)
  [![Apple Silicon macOS](https://img.shields.io/badge/OS-Apple%20Silicon%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos_arm64/insecure_mac_arm64_gui.zip?branch=pull/206)
  [![ARM64 Android](https://img.shields.io/badge/OS-Android-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/android/insecure_android_apk.zip?branch=pull/206)

ACKs for top commit:
  johnny9:
    ACK 20b23bc

Tree-SHA512: 3abaf8f6a020823974a60dca1146069a2cdc41c80a9d41621242538251327642678b60907604745a36f86666f7f4af87d09f327305239cdf4090af3be8ced9b3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants